Fix 308111

diff --git a/ChangeLog b/ChangeLog
index 2168c2b07ec135e72797fbe43b06b2c6b09620f3..9dd3d33a8c319324e5cb1e802599f47fd2a615b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-06-18  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkpaned.c (gtk_paned_add): Barf if more than
+       2 children are added.  (#308111, Morten Welinder)
+
        * gtk/gtkcalendar.c (gtk_calendar_init): _NL_FIRST_WEEKDAY is
        1-based.  (#163842, Pierre Ossman)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2168c2b07ec135e72797fbe43b06b2c6b09620f3..9dd3d33a8c319324e5cb1e802599f47fd2a615b7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-06-18  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkpaned.c (gtk_paned_add): Barf if more than
+       2 children are added.  (#308111, Morten Welinder)
+
        * gtk/gtkcalendar.c (gtk_calendar_init): _NL_FIRST_WEEKDAY is
        1-based.  (#163842, Pierre Ossman)
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2168c2b07ec135e72797fbe43b06b2c6b09620f3..9dd3d33a8c319324e5cb1e802599f47fd2a615b7 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2005-06-18  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkpaned.c (gtk_paned_add): Barf if more than
+       2 children are added.  (#308111, Morten Welinder)
+
        * gtk/gtkcalendar.c (gtk_calendar_init): _NL_FIRST_WEEKDAY is
        1-based.  (#163842, Pierre Ossman)
 

diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index a6b48e9537bd7b11629437c2894c89434872ad8c..dcf838efb19ab7c279a3e8a83839995585f58f1b 100644 (file)
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -1007,6 +1007,8 @@ gtk_paned_add (GtkContainer *container,
     gtk_paned_add1 (paned, widget);
   else if (!paned->child2)
     gtk_paned_add2 (paned, widget);
+  else
+    g_warning ("GtkPaned cannot have more than 2 children\n");
 }
 
 static void